Skip to content

Allow workspace options to affect build system search #1889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 17, 2025

Conversation

bnbarham
Copy link
Contributor

@bnbarham bnbarham commented Dec 14, 2024

There were a few places that options only took place after determining
a build system, even though we have multiple that impact the search (eg.
defaultBuildSystem and searchPaths).

Do not search up the directory tree when searching for a build system
for a workspace. Only allow this for implicit workspaces (created when
no existing workspace can handle a file) and only up to any existing
workspace roots.

@bnbarham bnbarham requested a review from ahoppen as a code owner December 14, 2024 01:03
@bnbarham
Copy link
Contributor Author

@swift-ci please test

@bnbarham bnbarham force-pushed the build-system-override branch from 6925afe to a26f35d Compare December 18, 2024 23:17
@bnbarham
Copy link
Contributor Author

@swift-ci please test

@bnbarham bnbarham force-pushed the build-system-override branch from a26f35d to d9bba40 Compare December 20, 2024 04:13
@bnbarham bnbarham changed the title Allow overriding the workspace buildsystem per workspace Allow workspace options to affect build system search Dec 20, 2024
@bnbarham
Copy link
Contributor Author

@swift-ci please test

@bnbarham
Copy link
Contributor Author

@swift-ci please test Windows platform

Copy link
Member

@ahoppen ahoppen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two small comments, otherwise LGTM. Thanks!

@bnbarham bnbarham force-pushed the build-system-override branch from d9bba40 to 3a4d11e Compare December 20, 2024 20:36
@bnbarham
Copy link
Contributor Author

@swift-ci please test

@bnbarham
Copy link
Contributor Author

@swift-ci please test Windows platform

@bnbarham bnbarham force-pushed the build-system-override branch from 3a4d11e to d6d337c Compare January 16, 2025 02:09
@bnbarham
Copy link
Contributor Author

@swift-ci please test

@bnbarham bnbarham force-pushed the build-system-override branch from d6d337c to 80941d8 Compare January 16, 2025 17:17
@bnbarham
Copy link
Contributor Author

@swift-ci please test

Copy link
Member

@ahoppen ahoppen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, just a few small comments.

@bnbarham bnbarham force-pushed the build-system-override branch from 80941d8 to e0532ae Compare January 17, 2025 03:59
@bnbarham
Copy link
Contributor Author

@swift-ci please test

@bnbarham
Copy link
Contributor Author

@swift-ci please test Windows platform

There were a few places that options only took place *after* determining
a build system, even though we have multiple that impact the search (eg.
`defaultBuildSystem` and `searchPaths`).

Additionally track project root and configuration paths separately, so
that when searching for implicit workspaces we can make sure to skip
creating duplicates.
@ahoppen ahoppen force-pushed the build-system-override branch from e0532ae to 0c89669 Compare January 17, 2025 16:37
@ahoppen
Copy link
Member

ahoppen commented Jan 17, 2025

@swift-ci Please test

@ahoppen
Copy link
Member

ahoppen commented Jan 17, 2025

@swift-ci Please test Windows

@ahoppen ahoppen merged commit bb699c9 into swiftlang:main Jan 17, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants